Revert "overviewControls: Always allocate the actor its full size"

This reverts commit f5a9dbb348632864095179f5f88a6fef9707e7c7.

This broke the alignment of the workspace thumbnail widget. I don't
know why, but let's not break things if we can...

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 1a064571824419f7be1f5f1ba1d24675e4ce137e..98480c84da86e2665ae08c8d2aa5a9676833ce6c 100644 (file)
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -68,7 +68,7 @@ const SlideLayout = new Lang.Class({
 
         let actorBox = new Clutter.ActorBox();
         actorBox.x1 = box.x1 + alignX + this._translationX;
-        actorBox.x2 = actorBox.x1 + availWidth;
+        actorBox.x2 = actorBox.x1 + child.x_expand ? availWidth : natWidth;
         actorBox.y1 = box.y1;
         actorBox.y2 = actorBox.y1 + availHeight;
 
@@ -323,6 +323,11 @@ const DashSlider = new Lang.Class({
 
         this._dash = dash;
 
+        // SlideLayout reads the actor's expand flags to decide
+        // whether to allocate the natural size to its child, or the whole
+        // available allocation
+        this._dash.actor.x_expand = true;
+
         this.actor.x_expand = true;
         this.actor.x_align = Clutter.ActorAlign.START;
         this.actor.y_expand = true;